From: arjen <arjen>
Date: Wed, 24 Dec 2003 07:40:36 +0000 (+0000)
Subject: Changed the order of the libraries
X-Git-Tag: V0_0_9~3
X-Git-Url: http://www.andromeda.nl/gitweb/?p=gnucomo.git;a=commitdiff_plain;h=fb3ef40fde8ca526d0fab890c5e8edbd0312652a

Changed the order of the libraries
---

diff --git a/configure b/configure
index b9cfae1..10d4742 100755
--- a/configure
+++ b/configure
@@ -693,7 +693,7 @@ fi
 
 PACKAGE=GnuCoMo
 
-VERSION=0.0.8
+VERSION=0.0.9
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -2517,50 +2517,12 @@ XML_CFLAGS=`$XML_CONFIG --cflags`
 XML_LFLAGS=`$XML_CONFIG --libs`
 
 LIBS="$LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
-LDFLAGS="$LDFLAGS -L/usr/local/lib $XML_LFLAGS"
+LIBS="$LIBS -L/usr/local/lib $XML_LFLAGS"
 CFLAGS="$CFLAGS $X_CFLAGS $XML_CFLAGS "
-CXXFLAGS="$CXXFLAGS $X_CFLAGS $XML_CFLAGS"
-
-echo $ac_n "checking for -lpqxx""... $ac_c" 1>&6
-echo "configure:2526: checking for -lpqxx" >&5
-if eval "test \"`echo '$''{'ac_cv_lib_pqxx'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lpqxx  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2533 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:2540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_lib_pqxx=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_lib_pqxx=no
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-echo "$ac_t""$ac_cv_lib_pqxx" 1>&6
-if test "$ac_cv_lib_pqxx" = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_LIBPQXX 1
-EOF
-
-  LIBS="-lpqxx $LIBS"
-
-fi
+CXXFLAGS="$CXXFLAGS  -Wno-deprecated $X_CFLAGS $XML_CFLAGS"
 
 echo $ac_n "checking for main in -lAXE""... $ac_c" 1>&6
-echo "configure:2564: checking for main in -lAXE" >&5
+echo "configure:2526: checking for main in -lAXE" >&5
 ac_lib_var=`echo AXE'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2568,14 +2530,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lAXE  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2572 "configure"
+#line 2534 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2607,7 +2569,7 @@ fi
 #AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData)
 #AC_CHECK_LIB(pthread, pthread_create)
 echo $ac_n "checking for xmlParseFile in -lxml2""... $ac_c" 1>&6
-echo "configure:2611: checking for xmlParseFile in -lxml2" >&5
+echo "configure:2573: checking for xmlParseFile in -lxml2" >&5
 ac_lib_var=`echo xml2'_'xmlParseFile | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2615,7 +2577,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lxml2  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2619 "configure"
+#line 2581 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2626,7 +2588,7 @@ int main() {
 xmlParseFile()
 ; return 0; }
 EOF
-if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2660,7 +2622,45 @@ fi
 #  use fixed paths for the time being.
 
 CXXFLAGS="$CXXFLAGS -I/usr/local/pqxx/include"
-LDFLAGS="$LDFLAGS -L/usr/local/pqxx/lib -lpqxx"
+LIBS="$LIBS -L/usr/local/pqxx/lib -lpqxx"
+echo $ac_n "checking for -lpq""... $ac_c" 1>&6
+echo "configure:2628: checking for -lpq" >&5
+if eval "test \"`echo '$''{'ac_cv_lib_pq'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lpq  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2635 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_lib_pq=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_lib_pq=no
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+echo "$ac_t""$ac_cv_lib_pq" 1>&6
+if test "$ac_cv_lib_pq" = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_LIBPQ 1
+EOF
+
+  LIBS="-lpq $LIBS"
+
+fi
+
 
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
diff --git a/configure.in b/configure.in
index a1b23b8..2206fba 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/gcm_input/message.h)
-AM_INIT_AUTOMAKE(GnuCoMo, 0.0.8)
+AM_INIT_AUTOMAKE(GnuCoMo, 0.0.9)
 
 
 dnl Checks for programs.
@@ -31,11 +31,10 @@ XML_CFLAGS=`$XML_CONFIG --cflags`
 XML_LFLAGS=`$XML_CONFIG --libs`
 
 LIBS="$LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
-LDFLAGS="$LDFLAGS -L/usr/local/lib $XML_LFLAGS"
+LIBS="$LIBS -L/usr/local/lib $XML_LFLAGS"
 CFLAGS="$CFLAGS $X_CFLAGS $XML_CFLAGS "
-CXXFLAGS="$CXXFLAGS $X_CFLAGS $XML_CFLAGS"
+CXXFLAGS="$CXXFLAGS  -Wno-deprecated $X_CFLAGS $XML_CFLAGS"
 
-AC_HAVE_LIBRARY(pqxx)
 AC_CHECK_LIB(AXE, main, , AC_MSG_ERROR(AXE Library is not installed))
 #AC_CHECK_LIB(X11, XOpenDisplay)
 #AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData)
@@ -48,7 +47,8 @@ AC_CHECK_LIB(xml2, xmlParseFile)
 #  use fixed paths for the time being.
 
 CXXFLAGS="$CXXFLAGS -I/usr/local/pqxx/include"
-LDFLAGS="$LDFLAGS -L/usr/local/pqxx/lib -lpqxx"
+LIBS="$LIBS -L/usr/local/pqxx/lib -lpqxx"
+AC_HAVE_LIBRARY(pq)
 
 dnl Checks for header files.
 AC_HEADER_DIRENT