Changeset 7280 in orxonox.OLD

Timestamp:

Apr 10, 2006, 11:47:05 AM (18 years ago)

Author:

bensch

Message:

better configure

Location:

branches/shared_lib

Files:

• configure.ac (modified) (3 diffs)
• src/Makefile.am (modified) (2 diffs)

branches/shared_lib/configure.ac

@@ -51 +51 @@
 AC_PROG_LIBTOOL
 AC_HEADER_STDC
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
-AC_CONFIG_SUBDIRS(libltdl)
 
 ## THIS IS OUR DEFAULT-DATA-DIRECTORY
@@ -618 +615 @@
 
 
+#---------#
+# libltdl #
+#---------#
+#AX_CHECK_HEADER_LIB ([ltdl.h], [ltdl], [lt_dlinit],
+#  [have_ltdl=yes],,[http://www.gnu.org/software/libtool/])
+if test x$have_ltdl = xyes ; then
+  LTDLINCL=""
+  LIBLTDL=""
+  LIBADD_DL=""
+else
+  AC_CONFIG_SUBDIRS(libltdl)
+fi
+
+AC_SUBST(LTDLINCL)
+AC_SUBST(LIBLTDL)
+AC_SUBST(LIBADD_DL)
+echo $LIBADD_DL
+
+
+
 # FIXME: Replace `main' with a function in `-lm':
  AC_CHECK_LIB([m], [main])
@@ -623 +640 @@
 
 # Checks for header files.
-AC_HEADER_STDC
 AC_CHECK_HEADERS([stdlib.h string.h])
 

branches/shared_lib/src/Makefile.am

@@ -12 +12 @@
 
 orxonox_CPPFLAGS = -DIS_ORXONOX -DPKG_LIBDIR="\"$(pkglibdir)\""
-orxonox_LDFLAGS = --export-dynamic
+orxonox_LDFLAGS =
 ##-ldl -rdynamic
 
@@ -25 +25 @@
                 util/libORXutils.a \
                 $(libORXlibs_a_LIBRARIES_) \
-                $(LIBLTDL) \
+                @LIBLTDL@ \
+                @LIBADD_DL@ \
                 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)