Changeset 34965

Timestamp:

Jan 18, 2013, 6:12:41 AM (14 years ago)

Author:

eugene

Message:

add ohana/dvo libs and include flags to dvograbber build; fix sprintf errors

Location:

branches/eam_branches/ipp-20121219/ippToPsps

Files:

• configure.ac (modified) (1 diff)
• src/Dvo.c (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)

branches/eam_branches/ipp-20121219/ippToPsps/configure.ac

@@ -36 +36 @@
 echo "IPPTOPSPS_LIBS: $IPPTOPSPS_LIBS"
 
+OHANA_CFLAGS="`ohana-config --cflags`"
+OHANA_LIBS="`ohana-config --libs` -lX11"
+
 IPP_VERSION
 

branches/eam_branches/ipp-20121219/ippToPsps/src/Dvo.c

@@ -195 +195 @@
         argv[i] = (char*)calloc(200, sizeof(char));
 
-    sprintf(argv[0], "nothing");
-    sprintf(argv[1], "-D");
-    sprintf(argv[2], "CATDIR");
-    sprintf(argv[3], dvoDatabase);
+    snprintf(argv[0], 200, "nothing");
+    snprintf(argv[1], 200, "-D");
+    snprintf(argv[2], 200, "CATDIR");
+    snprintf(argv[3], 200, "%s", dvoDatabase);
 
     this->dvoConfig = dvoConfigRead(&argc, argv);

branches/eam_branches/ipp-20121219/ippToPsps/src/Makefile.am

@@ -25 +25 @@
 
 # DVO
-dvograbber_CFLAGS = $(IPPTOPSPS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -I/usr/include/libxml2
-dvograbber_LDFLAGS = $(IPPTOPSPS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS) -lxml2
+dvograbber_CFLAGS = $(IPPTOPSPS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) $(OHANA_CFLAGS) -I/usr/include/libxml2
+dvograbber_LDFLAGS = $(IPPTOPSPS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS) $(OHANA_LIBS) -lxml2 -lkapa -ldvo -lFITS -lohana
 dvograbber_SOURCES = \
         Dvo.c \