Changeset 3999 for pjproject/trunk/aconfigure.ac

Timestamp:

Mar 30, 2012 7:10:13 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• aconfigure.ac (modified) (4 diffs)

pjproject/trunk/aconfigure.ac

@@ -1 @@
-AC_INIT(pjproject,1.x)
+AC_INIT(pjproject,2.x)
 
 host_orig="$host"
@@ -90 +90 @@
     *)
         ac_pjdir=`pwd`
+        ;;
+esac
+
+AC_SUBST(ac_shlib_suffix)
+case $target in
+    *mingw* | *cygw* | *win32* | *w32* )
+        ac_shlib_suffix=dll
+        ;;
+    *darwin*)
+        ac_shlib_suffix=dylib
+        ;;
+    *)
+        ac_shlib_suffix=so
         ;;
 esac
@@ -775 +788 @@
              )
 
+dnl # Include libsamplerate
+AC_SUBST(ac_resample_dll)
+AC_ARG_ENABLE(resample_dll,
+              AC_HELP_STRING([--enable-resample-dll],
+                             [Build libresample as shared library]),
+              [if test "$enable_resample_dll" = "yes"; then
+                [ac_resample_dll=1]
+                AC_MSG_RESULT([Building libresample as shared library... yes])
+               fi],
+              AC_MSG_RESULT([Building libresample as shared library... no])
+              )
+
 dnl # SDL alt prefix
 AC_ARG_WITH(sdl,
@@ -1217 +1242 @@
               ])
 
-
 dnl ##########################################
 dnl #